tree 9779095e5a603526d44704c559c820d3628c5ea8
parent 7de6b5a2e7043e6362056bbffe99c9ac445f8786
parent f7142c13ebfeb0c5041687a3e4300efb6722e821
author Daniel Xie <dxie@google.com> 1442863668 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442863668 +0000

am 5874b094: am dab4ebdc: am e2e0a71e: am f7142c13: am 5a1c9904: am 2a1514dc: am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e

* commit '5874b094dca800330c52dbf7dbc91dbd4e8eeb4e':