tree b0d6ca40bde4f2dbf8a69bd982bf053825434ab4
parent 2d22fa9b07f2db449162c0de894faee288f6d85b
parent a011f009de12362f1a2b6fc92d2726be646a10f5
author Daniel Xie <dxie@google.com> 1442418918 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442418918 +0000

am a011f009: Merge "Lookup private resources in run-time" into kitkat-cts-dev automerge: ac8f57e

* commit 'a011f009de12362f1a2b6fc92d2726be646a10f5':