tree 6364a926048631e30bc71d28a330be3b7e62e0dd
parent 09f43806577ee46e517fba8523127a1f766a08fb
parent d51f2f608904252400f4e8c8e8ed0c27a0ea2382
author Daniel Xie <dxie@google.com> 1445378050 +0000
committer android-build-merger <android-build-merger@google.com> 1445378050 +0000

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

* commit 'd51f2f608904252400f4e8c8e8ed0c27a0ea2382':
  Squashed commit of the following: