| commit | 40c1be9326b4e40886bca4857fe9afcad2a4f927 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Aug 20 18:01:02 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 20 18:01:02 2015 +0000 |
| tree | ca7c85aace2d1822ddefd90c2109ca30063d1295 | |
| parent | ddf02f6fad1196d70c773b016be9c6e38592e322 [diff] | |
| parent | 307cd5473abe9a31577ade05d61b2539e16f0697 [diff] |
Merge "fixed mockview" into kitkat-cts-dev automerge: b7a630f -s ours automerge: 307cd54 * commit '307cd5473abe9a31577ade05d61b2539e16f0697': fixed mockview