| commit | 01d7fccf9df30f77de5c99d74546d2bbe2955514 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 07 10:46:32 2012 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 07 10:46:32 2012 -0800 |
| tree | bde01b8e163d97c52ae2773988bfacb1278da6de | |
| parent | b9196f463411ec442b4f8b0d32e03b8c6e537748 [diff] | |
| parent | 9760a06a7266cc7cc5ae77dafb6ce3d5b8a9dd75 [diff] |
resolved conflicts for merge of 9760a06a to stage-aosp-master Change-Id: I6cb907b591225cb7f48cee69d5d22c00013fa995