OSDN Git Service

Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
authorFelipe Leme <felipeal@google.com>
Wed, 21 Jun 2017 04:02:25 +0000 (04:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 04:02:25 +0000 (04:02 +0000)
am: 4f7fd183eb

Change-Id: Id26a5cdd53035eb94d4de3c0acf4378268b24c2e


Trivial merge