tree 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
parent 0fceb0db9e85272d1b794f6637bbf49ec3cf06d7
parent 70eaeb38b846e915b24834dfae2de4b1be267ec7
author Xavier Ducrohet <xav@android.com> 1329944090 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329944090 -0800

am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1

* commit '1f46d79faf1b947b3d169c336e013cea89e8de11':