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)
commitc5ecbe4047bead89672c18b3549fbcb2dd269171
treeb80fd8acfbfff612d70ffdeb5b32ab16fa7524bc
parentde90bd9c1163e3ea51bd3c1135e370b368663929
parent6f0c3f4bdcba1b1b66eed4d81d53aade3db53aa4
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04
am: 6f0c3f4bdc

Change-Id: I85587a1eccc80443efb76853ec70ea339e422481