commit | fa4c1ce1cc013d65bade93e750de49981b8095b4 | [log] [tgz] |
---|---|---|
author | smain@google.com <smain@google.com> | Fri Oct 17 08:33:01 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Oct 17 08:33:01 2014 +0000 |
tree | 2b1539251c886f6e138e1c9185d528d0800ee9af | |
parent | 4ed4a86d6d05d428c428309f019b9702f6d89fd0 [diff] | |
parent | f19f639773e64289ed7345b8a1ea4dd244aa4882 [diff] |
Merge "edits to the lollipop highlights" into lmp-dev automerge: f19f639 * commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882': edits to the lollipop highlights