| commit | 7ad2854adc0abe8dd7909a6ed401107ad09bc3d2 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 10:18:32 2016 -0700 |
| committer | Chih-Hung Hsieh <chh@google.com> | Wed Aug 10 10:18:32 2016 -0700 |
| tree | d94dc88d14ace505e7230fe79e78e00cbab1520c | |
| parent | aee0669a7bdc1502a5e3d0752aaf84b0354a005e [diff] | |
| parent | 1c10de5b7bafaa7886bf6c9f61d435aeb2b1e7f4 [diff] |
resolve merge conflicts of 1c10de5 to stage-aosp-master Change-Id: I1e395ecb96524c18348b9f65c96d60c9eae9be45