tree 80f1e050ab4a89edc1855cc9f01af7611c50fe5b
parent 837e940f7d652e9fd82c2ba2862c8326f067c462
parent 4434dae41254ffd5aaac0afd63be0f32d198efbf
author Daniel Xie <dxie@google.com> 1445377459 +0000
committer android-build-merger <android-build-merger@google.com> 1445377459 +0000

Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac
am: 4434dae412

* commit '4434dae41254ffd5aaac0afd63be0f32d198efbf':
  Squashed commit of the following: