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

Change-Id: If4100aebe657cc11438526fc0d0151d4158e2372


Trivial merge