| commit | c080f112b5cfc8894b8ca12626062e0054f05643 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri Jan 22 00:46:34 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 22 00:46:34 2016 +0000 |
| tree | 040fd39c42808b801b2894304b4c395e25d7c2ad | |
| parent | 829ab6daf5ea43cf805f6d8df4791189b2d3ee7e [diff] | |
| parent | e5530ec0b4204f4f3b4f92a87056ce18a8d76793 [diff] |
Merge "resolve merge conflicts of 32a95af029 to master."