| commit | a7cb85ce8e8f696ee70d758e80e46f70cf8077d2 | [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 | 77dbaad7b97bdc41d58dfca26cd35ef05776a30d [diff] | |
| parent | 619875061d3439e886811dc41d91781b1f581f52 [diff] |
resolve merge conflicts of 743b0c5 to stage-aosp-master am: 619875061d Change-Id: Iafbb322783f81cf16468afafaf97be701aa6c9ef