| commit | a94c36aa7e31bc802fa0db33e0cf95ae6860c392 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Thu Aug 03 11:15:20 2017 -0700 |
| committer | Dmitry Shmidt <dimitrysh@google.com> | Thu Aug 03 11:15:20 2017 -0700 |
| tree | 7171a5ed06ad99cb4a7964df7932d90a4c860a6e | |
| parent | 143a476a4cf46006f39c87f6344473ff64de6e72 [diff] | |
| parent | c3273fcbafab5477b9ecde925c1ff36bca1c1974 [diff] |
resolve merge conflicts of c3273fc to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I3e96d3dd7b22d9a40592e55f4dcbdae4474fb4ea