| commit | eb5e75f4e32c41fb504551542d044e2ebece0ede | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Mar 25 22:52:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 25 22:52:54 2016 +0000 |
| tree | cc77cf5e3b52594dfe4d18e6bc3418a1ff3a5c3c | |
| parent | 6b8662bc244912e4da55ea9d39b64f38b0769138 [diff] | |
| parent | 4976d43f3d26fd73be757d9c3b1acff1168926b4 [diff] |
DO NOT MERGE reset to 2dc97d3d with history am: 3684d5f -s ours am: 4976d43 -s ours * commit '4976d43f3d26fd73be757d9c3b1acff1168926b4':