OSDN Git Service

Merge "Synchronize the code with AOSP"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 17 Aug 2016 04:15:14 +0000 (04:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 17 Aug 2016 04:15:16 +0000 (04:15 +0000)

Trivial merge