| commit | 48576911a2de25c46ecfbecdf7dcb373b70be3a5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 18 15:14:08 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 18 15:14:12 2012 -0800 |
| tree | 108659138abd42e51d77aac4fa8366f4e4b3c4da | |
| parent | 0c1badc64e5340b643640d37120bf926142dda1b [diff] | |
| parent | 9b64c4906be5314a6c2cde520317b8cb36e7b3e4 [diff] |
Merge from AOSP staging branch Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd