OSDN Git Service

Merge changes I30f397b0,I717a6f03 into lmp-dev
authorAdam Seaton <aseaton@google.com>
Thu, 17 Nov 2016 18:10:46 +0000 (18:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 18:10:46 +0000 (18:10 +0000)
commit27ac4ac1daf9cd47bd1d308c582eca9d761278e1
tree431c680abfaa689385de3959f2984d8764fea693
parent6a9981128d711ccf9e336e2f829eea44544770de
parent1a242b67fe7f9f8972c2c08c4d26a351522ac115
Merge changes I30f397b0,I717a6f03 into lmp-dev
am: 1a242b67fe

Change-Id: Ifd69049e1e2d055eb99c3c40c3ca66b5500d5a1e