OSDN Git Service

Merge "Synchronize the code with AOSP" into stage-aosp-master am: fd172619d1 am:...
authorPavlin Radoslavov <pavlin@google.com>
Wed, 17 Aug 2016 04:30:04 +0000 (04:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 04:30:04 +0000 (04:30 +0000)
am: 6e671275af

Change-Id: I9c3ca1e79e76b092602f9dc73db690f54b1f55ba


Trivial merge