tree 66c0ed78f6719516468fa3d9e16f74d2b0601228
parent 4f4b81bd3d6837e05a552bc64b8742ca093a2685
parent 1e48a1eec0a5f1d015256e38f627947105af5bac
author Andreas Gampe <agampe@google.com> 1412242667 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412242667 +0000

am 1e48a1ee: am c152c7aa: Merge "Revert "Frameworks/base: Update to preloaded-classes"" into lmp-dev

* commit '1e48a1eec0a5f1d015256e38f627947105af5bac':
  Revert "Frameworks/base: Update to preloaded-classes"