tree 3024caa88cedc9f9eff427cd57ae2fe747721a0d
parent 1618c86df16352478a23a5868fb53beb561c3394
parent 2a1514dc1ec502125df6af7e30425403ff5a21a4
author Daniel Xie <dxie@google.com> 1442860949 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442860949 +0000

am 2a1514dc: am 9c37f4a0: am da12f30f: am b4a9fcb1: am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e

* commit '2a1514dc1ec502125df6af7e30425403ff5a21a4':