tree 9779095e5a603526d44704c559c820d3628c5ea8
parent a804f8ddeeff60d559321414c32a425f9c8f3606
parent 6de0e351c404d79799544f3168ef4a707bf10b4d
author Daniel Xie <dxie@google.com> 1442283176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442283176 +0000

am 0e961f58: am f5b0ba64: am 148ab94e: am 6de0e351: am affc5b6a: am db636cae: am 91a9bc2a: am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev

* commit '0e961f58ae82e78eb45bf46c614ef613e7eda1d5':