| commit | f51cc58c09efe79dd2152297f376c3dab0c321df | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Fri Oct 17 18:52:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 18:52:46 2014 +0000 |
| tree | fb0a369373fdc27838b95fc17235eff7e9dc472a | |
| parent | 702cb3b2f6b6d0eca9f8d40dc94142fcc6b53a35 [diff] | |
| parent | dfcdfbd64acc4d2135b28eb3d61d2a174748e55d [diff] |
am dfcdfbd6: am f19f6397: Merge "edits to the lollipop highlights" into lmp-dev * commit 'dfcdfbd64acc4d2135b28eb3d61d2a174748e55d': edits to the lollipop highlights