OSDN Git Service

Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am:...
authorAdam Seaton <aseaton@google.com>
Thu, 17 Nov 2016 19:19:58 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 19:19:58 +0000 (19:19 +0000)
am: 6f0c3f4bdc

Change-Id: I85587a1eccc80443efb76853ec70ea339e422481


Trivial merge