commit | 65cad1ee004856f25cbe7047afcbc92e5229dc60 | [log] [tgz] |
---|---|---|
author | Brian Attwell <brianattwell@google.com> | Thu Oct 30 20:48:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 20:48:28 2014 +0000 |
tree | c316d0fa0d9bb401d8a6e8d27d2a000bb3d7e14f | |
parent | 5874b8c62f10ab7895a63a937f39ea6411f362a2 [diff] | |
parent | 8ec657f9e44271d56f1100cf7cb769a7df5c0d0c [diff] |
am 8ec657f9: Merge "New assets for the edit screen" into lmp-mr1-dev * commit '8ec657f9e44271d56f1100cf7cb769a7df5c0d0c': New assets for the edit screen