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)
commit5fd9dd2e744668c2baeaeb84a30dbeeb5f0d74b6
treefd1cc9aa839b34e3886285389e197b5856c20e69
parent605f633995ea1e75b7fd80a48e0a59a08ddc2227
parent4f7fd183ebaec60256d38fa4633a09f1a4afc5a5
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am: 4f7fd183eb

Change-Id: Id26a5cdd53035eb94d4de3c0acf4378268b24c2e