| commit | 07bde72ff9209de9c037d9bba36bdf0cba299aab | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 24 07:21:07 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 24 07:21:07 2012 -0700 |
| tree | 0013a04e97baa40e711180b60d58ba553cb886c4 | |
| parent | 4d3a7b075298d1379e9d6ba84bc02a347344a001 [diff] | |
| parent | 9455f8f2667bd86a7e51b19112f759406274e76b [diff] |
resolved conflicts for merge of 9455f8f2 to jb-mr1-dev Change-Id: I6c6970adb58ac45473c7cc665d99f8e8a6ca8571