Skip commit 'c5bbebc46ac7725d43692602422ee3fc76cac7b0' on master. am: b1fa5e8f2c
authorXin Li <delphij@google.com>
Thu, 26 Jan 2017 20:37:32 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 20:37:32 +0000 (20:37 +0000)
am: ef0c4176d6

Change-Id: I722cc549948cf2de67e6f73e9567c1fd60b81dd3


Trivial merge