| commit | 9f6b80c9c8073e1a8ee1b7ed124e5321cb4052df | [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 | e1eb2272d6b46b0c0d0c408d33d7c45430bd6999 [diff] | |
| parent | a617e336dc9060e79f35c1ad58b05241331e02d2 [diff] |
resolve merge conflicts of a617e33 to stage-aosp-master Change-Id: I0d1e6b1771eebc38f7eea5a942395c5f8ff6a5ac