| commit | 7f829e5aa26bf72c8818f7e9a042bf044fc4d06e | [log] [tgz] |
|---|---|---|
| author | Meng Wang <mewan@google.com> | Tue Mar 21 15:57:10 2017 -0700 |
| committer | Meng Wang <mewan@google.com> | Tue Mar 21 15:57:10 2017 -0700 |
| tree | b8d00a7ac0a4cc04fa45488c5e8c313caa82a8a0 | |
| parent | 0090ebf50d523be5fff156e22e11563f07ad0802 [diff] | |
| parent | 451501cc45bb5b71946f5251ce0d754314235789 [diff] |
resolve merge conflicts of 451501cc4 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ifd2f8b336bba0ec3f85b16ed967c23b45a2f32e6