OSDN Git Service

Merge changes Id513b72a,I92cd0116,I62393b58,I90ac2224,I527f88ac
authorDan Albert <danalbert@google.com>
Fri, 9 Sep 2016 01:17:41 +0000 (01:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 01:17:41 +0000 (01:17 +0000)
am: 572791e027

Change-Id: Ide3f10bab5d5789c0482cd55db974559c7f00366


Trivial merge