tree e934303c454aff1e99e1da3fa2ff4a76a55e82b6
parent 9cd1c528671d3adfbe6503f9ca942f6964d1b181
parent 4f7fd183ebaec60256d38fa4633a09f1a4afc5a5
author Felipe Leme <felipeal@google.com> 1498017747 +0000
committer android-build-merger <android-build-merger@google.com> 1498017747 +0000

Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am: 4f7fd183eb

Change-Id: Ibd7aebe46d1bb419ca33f8f38999fa9ab0d981ff