tree d94c99e423ed1f51e90ae61eacc6af273c96f19b
parent fabb4125729a22bc7d6dca26c8913a384d552c18
parent ea03927cea04a4673c847957cd631cd63b952019
author David Sehr <sehr@google.com> 1509592446 +0000
committer android-build-merger <android-build-merger@google.com> 1509592446 +0000

Merge changes from topic "bgdex2oatd_cherry_pick" am: e1dfc74b1a
am: ea03927cea

Change-Id: Iba12335e4aefa6dfba7d03dc15baa51253be2108