| commit | 75d9cabc8e921398561fdb8008ffb50c33592b38 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Wed Mar 28 11:05:45 2012 -0700 |
| committer | Raphael Moll <raphael@google.com> | Wed Mar 28 11:05:45 2012 -0700 |
| tree | 6edbe8a8221d77f6324dd8e49a1a6eeb314e2398 | |
| parent | 2038b5acc50b7eb848becb6a03897918669a9dd3 [diff] | |
| parent | fe2da416d8d3f8d037751d74a94f5f7b1d3432e1 [diff] |
resolved conflicts for merge of fe2da416 to stage-aosp-master Change-Id: I70924f6d51e2c790314a2f34ae7c33935a72bda6