OSDN Git Service

Synchronize the code with the internal tree am: 55f82cd30f am: 8f4fb98c7e am: db92f4d323
authorPavlin Radoslavov <pavlin@google.com>
Wed, 17 Aug 2016 04:16:42 +0000 (04:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 Aug 2016 04:16:42 +0000 (04:16 +0000)
am: 456991488b

Change-Id: I9041459bb8468061b74cf35000bdcbe2263ddd51


Trivial merge