OSDN Git Service

Merge "edits to the lollipop highlights" into lmp-dev
authorsmain@google.com <smain@google.com>
Fri, 17 Oct 2014 08:33:01 +0000 (08:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Oct 2014 08:33:01 +0000 (08:33 +0000)
automerge: f19f639

* commit 'f19f639773e64289ed7345b8a1ea4dd244aa4882':
  edits to the lollipop highlights


Trivial merge