OSDN Git Service

Merge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Wed, 17 Aug 2016 04:16:43 +0000 (04:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 04:16:43 +0000 (04:16 +0000)
commit833ed0e615390b4b02e91c5875636ef14ac6f638
treef65e9cbe74af31d61a6ec03f0a078801985e127c
parent103b60fbc2a943144573c40254b3201e45879c22
parent146c3855edac9055a5548d851c6132f868ee1f90
Merge "Synchronize the code with AOSP" into nyc-mr1-dev-plus-aosp
am: 146c3855ed

Change-Id: Ifdcf7217d25ecdb545cb5f18de3713529f4dce58