| commit | bc2af49c21358454c18418ef194a26d15a0d41d5 | [log] [tgz] |
|---|---|---|
| author | Jordan Liu <jminjie@google.com> | Wed Oct 26 11:24:54 2016 -0700 |
| committer | Jordan Liu <jminjie@google.com> | Wed Oct 26 12:05:27 2016 -0700 |
| tree | 44513019358dc467a18bec7650e594597511ef96 | |
| parent | b5fed003cce94a92be1f35a28f35815f2d23b296 [diff] | |
| parent | ab005465b6e1ce252c0573ee1ae5917971707df4 [diff] |
resolve merge conflicts of ab00546 to stage-aosp-master Change-Id: Ief51ceeeae7a11e26dd2c53411ce67e6d0e6bd49