commit | 7f14a76e9c74d69d25a66d8bd4656a1243c6feb4 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Tue Oct 20 22:01:33 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 22:01:33 2015 +0000 |
tree | de421cb30a26928ec04cdb3e13c1386e6fa6a4fa | |
parent | c17d5c4f3f41bb1cb07161874badabcad21d0a9f [diff] | |
parent | a3012f29ae4f25fe9677bee869f7249b83ad9c1f [diff] |
Merge "Squashed commit of the following:" into kitkat-cts-dev am: 4791dcb0ac am: 4434dae412 am: d51f2f6089 am: a3012f29ae * commit 'a3012f29ae4f25fe9677bee869f7249b83ad9c1f': Squashed commit of the following: