tree 1b3c27130853bfa21bbef41f34d477d8fa864823
parent 227b641e88342a38e292ab2d8726a5fbc49c2f39
parent ffc3697126cdc6807b9c0fc3fb9d7b813fc1817e
author Daniel Xie <dxie@google.com> 1445376387 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1445376387 +0000

Merge "Squashed commit of the following:" into kitkat-cts-dev