| commit | 9d9aac4cacce75b4847aebce0f019250dc3b4e93 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Fri Oct 24 13:12:08 2014 -0700 |
| committer | Craig Mautner <cmautner@google.com> | Fri Oct 24 13:12:08 2014 -0700 |
| tree | 9e74435ad8e21fe6ace6a1c49ca2f596c60ced34 | |
| parent | 5a71f83227f0340a265f34b226d8fe01d4dd9773 [diff] | |
| parent | 2bf3800b10e1cc9a291527fc83efc986ba83aa37 [diff] |
resolved conflicts for merge of 2bf3800b to stage-aosp-master Change-Id: I3e650f90521e4d615504c3423ab228966389a482