tree 3a2dc36bc6652f9592fa077aba710bfc41767511
parent 424456969a8b0f774c05cfb733051358bd9fecaa
parent 67651de7590224c2483d0e574217a0939b5c78bd
author Daniel Xie <dxie@google.com> 1442278233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442278233 +0000

am 67651de7: am 32540663: am 4ed5d94e: am ee05618c: am ca4ee5db: am ac8f57e8: Merge "Lookup private resources in run-time" into kitkat-cts-dev

* commit '67651de7590224c2483d0e574217a0939b5c78bd':