| commit | b8be94ec4658436f1314101a2fdc64e707be410e | [log] [tgz] |
|---|---|---|
| author | Shinichiro Hamaji <hamaji@google.com> | Wed Dec 09 05:30:18 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 09 05:30:18 2015 +0000 |
| tree | 62663d4976c935ada666f74352723fb4a8667695 | |
| parent | 52b0fd6083e2ddc665887b7814ab8d021818c8b9 [diff] | |
| parent | e910f6043a64a3231a0d6cd8343416ce5ac5847d [diff] |
Merge "resolve merge conflicts of 928b21e640 to stage-aosp-master." into stage-aosp-master