tree 669be74105048866cf59479b85e535bc653e5a25
parent d91b1f6bb84c22b9b20df2537500bf23f6b65ad2
parent 55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456
author Jeff Sharkey <jsharkey@google.com> 1445388905 +0000
committer android-build-merger <android-build-merger@google.com> 1445388905 +0000

Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
am: 55d2b6e8e6

* commit '55d2b6e8e6f364e2fd52c45b5fa3eb6a56082456':
  Correctly derive ABI for apps on adopted media.