OSDN Git Service

MAP MCE am: b8fc0679e8 am: b13240028b
authorJoseph Pirozzo <pirozzoj@google.com>
Wed, 2 Nov 2016 01:18:38 +0000 (01:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 01:18:38 +0000 (01:18 +0000)
am: 5602b26f41

Change-Id: I54f67bbb44c3ecbdaa96b2f71d762bbb8bdce46c


Trivial merge