commit | 10c1130a827f4be77be8069fc7a96c57413da538 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Sep 12 23:20:45 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 12 23:20:45 2014 +0000 |
tree | a04cb4dc82b450e718dfe7ccf78d8c355e28a75e | |
parent | 5ea24a847bae96ee49e801aae88c170fc1487f6a [diff] | |
parent | 603eae7241a61a2c9470901c96e3f7fd54a9d1e3 [diff] |
am 8ceb5021: am 1379b508: Merge "Set up final resource identifiers." into lmp-dev * commit '8ceb5021de9b75376e7e52b7ef7e5631fdd5846c': Set up final resource identifiers.