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:50:33 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 19:50:33 +0000 (19:50 +0000)
am: 8185ca3cd3

Change-Id: I6dc1ad0fb19ca478f786274c355f7ad71871a6e3


Trivial merge