| commit | be2c803157a3a1c0927e3cd4c0853119067c9b53 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 08 12:09:33 2013 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 08 12:09:33 2013 -0700 |
| tree | 8acacf56d2113af3be82f409544cb750a4c02f8d | |
| parent | 3fba2ebb0e372f46cc9bb6cbb0b53b8477eaada9 [diff] | |
| parent | 0fc8e0bc58801df865a21196f9920e408fc85296 [diff] |
resolved conflicts for merge of 0fc8e0bc to stage-aosp-master Change-Id: Ib65aa24251d8f34834f20fa4301782520c9554f6