| commit | e910f6043a64a3231a0d6cd8343416ce5ac5847d | [log] [tgz] |
|---|---|---|
| author | Shinichiro Hamaji <hamaji@google.com> | Tue Dec 01 18:17:21 2015 +0900 |
| committer | Shinichiro Hamaji <hamaji@google.com> | Tue Dec 01 18:23:50 2015 +0900 |
| tree | 9cb6ecff22fdcb064aa942951145effca080cd08 | |
| parent | fc9b6b3893e0190ad4cac66d041f8165f6575c17 [diff] |
resolve merge conflicts of 928b21e640 to stage-aosp-master. Change-Id: I0d8f4624e2ab66f25676d8a0012535ccf86e7927