tree c278af83012bfd1c771924f162f568265196b50b
parent 667762608f41f3f7095d02d212e3447b67ccb478
parent 5ef197eb7c9099cfd31d089f67cd7cc9c17be942
author Daniel Xie <dxie@google.com> 1445398646 +0000
committer android-build-merger <android-build-merger@google.com> 1445398646 +0000

Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae am: 7f14a76e9c am: c9c7b3a5ad am: bfeea01aa2 am: 4d409ca18e am: c90c9307ea
am: 5ef197eb7c

* commit '5ef197eb7c9099cfd31d089f67cd7cc9c17be942':
  Squashed commit of the following: