| commit | c4bab46f92f0e005e84436384166469f3e8cb153 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Mon Jun 20 12:58:37 2016 -0700 |
| committer | Dmitry Shmidt <dimitrysh@google.com> | Mon Jun 20 12:58:37 2016 -0700 |
| tree | e91bcce08fb4b18f829ebc9e707fb57f4a62b0fb | |
| parent | 203bbe0003bb8b7b48d14ff6e8018e4a85c307d5 [diff] | |
| parent | ae8be613e5ec4e30c01008a0cd806ed23ffd1dad [diff] |
resolve merge conflicts of a617e33 to stage-aosp-master Change-Id: I0d1e6b1771eebc38f7eea5a942395c5f8ff6a5ac