OSDN Git Service

Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe
authorAdam Seaton <aseaton@google.com>
Thu, 17 Nov 2016 18:18:50 +0000 (18:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 18:18:50 +0000 (18:18 +0000)
commitac64c64f9a84df6cd6599f71d7126a4f396b2751
treeed62d61600646ec356f408dc41fd27234513dbef
parent1691e694973de259692417ebb62ee53dc99c010e
parent27ac4ac1daf9cd47bd1d308c582eca9d761278e1
Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe
am: 27ac4ac1da

Change-Id: Iee18a297b1c52c6c149846670b0e73cf5a23a53c