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

Change-Id: I71cedd451ef3bd6e29f8ece5025c4603defc2091


Trivial merge