| commit | 99c8167a1634a9347d08813190ac26bf7f05fb9b | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Fri Oct 17 18:53:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 18:53:30 2014 +0000 |
| tree | 3327f0a0ae34d07860d4ae20215bd0f2483c6468 | |
| parent | cd5d6a6826e21f131a9715538d22a888b7cb61b0 [diff] | |
| parent | a1012fb5ad6fa07fccf5b9c791bd77579720c857 [diff] |
am a1012fb5: am fe511970: Merge "edits to the Lollipop highlights" into lmp-dev * commit 'a1012fb5ad6fa07fccf5b9c791bd77579720c857': edits to the Lollipop highlights