tree aa5b2171e18a9e340d8c41529560d66e9faa3638
parent a44564e6c0b6c0844a0bda93875a9f6181ddf5b9
parent 7f14a76e9c74d69d25a66d8bd4656a1243c6feb4
author Daniel Xie <dxie@google.com> 1445378877 +0000
committer android-build-merger <android-build-merger@google.com> 1445378877 +0000

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

* commit '7f14a76e9c74d69d25a66d8bd4656a1243c6feb4':
  Squashed commit of the following: