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)
am: 146c3855ed

Change-Id: Ifdcf7217d25ecdb545cb5f18de3713529f4dce58


Trivial merge