| commit | 1488f79776d043ce599b7d86d9f86df102c6603f | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Fri Dec 11 22:48:56 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Dec 11 22:48:56 2015 +0000 |
| tree | eaa962111c212791218bdd944f6965387436eb87 | |
| parent | b53b9f99ad7e27eedbe304419113e573e2c8e555 [diff] | |
| parent | 89add11bb4c4a3cae38d84d1151e60617efb26a5 [diff] |
Merge "resolve merge conflicts of f1df0f59c1 to master."