| commit | bffce8ce7a4a4c8625d5443093e2c1caaabaf975 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed Oct 14 16:24:28 2015 -0700 |
| committer | Winson Chung <winsonc@google.com> | Wed Oct 14 16:24:28 2015 -0700 |
| tree | fd1ba7150071cb166993da1decdd3f80549c7907 | |
| parent | a1adb5c3e4dd8f342ea188046f0f75cb4714ce14 [diff] | |
| parent | cf426036de5a39909b0c5408816a43829642bc76 [diff] |
resolved conflicts for cf426036 to stage-aosp-master Change-Id: If1bd5860a2f7392df7f7d6fdb13cdc315d8fcc8c