tree f240b3b67c913d678e503f0c6981540a40e0d874
parent 2520f1571ee277aadca3b728597a7bb4f2edc0f7
parent 2aab7d3d9e10a1242fb5faa2851de721ba1d18c2
author Daniel Xie <dxie@google.com> 1455658937 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1455658937 +0000

Merge "resolve merge conflicts of 531d76e04d to lollipop-mr1-cts-dev" into lollipop-mr1-cts-dev