| commit | 7f0a56dbf15fbf41f7f2b800ab73093de940d503 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Nov 16 07:00:33 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 16 07:00:33 2016 +0000 |
| tree | 65410f83e121df55cbdec80e9b2f746096810cf7 | |
| parent | 2274e57f6772dccd2c80ade0e70be0b7368506b2 [diff] | |
| parent | 03eb766a562598636a0e7c717da0cefdd5f2b329 [diff] |
resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 Change-Id: Iabf3c81f0ad98143cfac56ecfa00a93008a31318