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:34:32 +0000 (19:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 19:34:32 +0000 (19:34 +0000)
am: 4a45d769e9

Change-Id: I4be9db9c0a6554c89e757220b115f2af22631964


Trivial merge