| commit | a545941e6c21636a6bbccd9217b37ebe1a317b6d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jul 11 21:03:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 11 21:03:57 2016 +0000 |
| tree | 4c09bec90d8a807064fd476b7504a3adc795e8a8 | |
| parent | 76c31df3bcb446bf2646dfac4a460601080ef240 [diff] | |
| parent | 278574fc45986ae59d09df464b7db9873808d49d [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d Change-Id: Iafbb322783f81cf16468afafaf97be701aa6c9ef