| commit | 5c34e4895c4f66a19901bd2d9d1eb6b9bcd623bd | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Wed Sep 20 14:02:25 2017 +0900 |
| committer | Jae Shin <jaeshin@google.com> | Wed Sep 20 14:02:25 2017 +0900 |
| tree | d970bed69b4a7a25c62f3a7747deb8598dc9ad1c | |
| parent | 29aa7b97f7895eaaa2559bedccb1057139428e59 [diff] | |
| parent | 8007bdd7d229ca0befb580a63525d2eda604ffa7 [diff] |
resolve merge conflicts of 8007bdd7d to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I728cde095a0b722ff64c0f7b0ef1df4b54cf1fbd