commit | 90c92c83ceadeb8b252a06262fadf2ac5c37c0ba | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Thu Dec 10 18:10:47 2015 -0800 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 10 18:10:47 2015 -0800 |
tree | ffaf83d48eeffc1cf39d71bbe8a26c87a87e8cea | |
parent | 1fa6039981f0a16356281d1550db9a6b4ebfdbf1 [diff] | |
parent | 6a2af61fa479cea4610d7be56e76a4fd89a81ed0 [diff] |
Merge "Fixed break #2" into kitkat-cts-dev am: 9053806660 -s ours am: f2b7f84532 am: 906db8099e am: ed2be337f8 am: 8bf14b2169 am: 9d933d9473 am: 0b7028aca6 am: 66e2af7309 am: aa0a75665f am: 6a2af61fa4 * commit '6a2af61fa479cea4610d7be56e76a4fd89a81ed0':