| commit | 49f0a5df739d2da22f24ac14fe430adaffa13f3b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Apr 15 16:40:04 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Apr 15 16:40:04 2013 -0700 |
| tree | 5011287105fafab93dd1c1ec0affcaa8cf3d66cc | |
| parent | e8ae4eafea69ccdffd91865f46ee2d569cdc1203 [diff] | |
| parent | 6a67a38f46cafdb9a9cedf3351f7150140cf0bd7 [diff] |
resolved conflicts for merge of 6a67a38f to jb-mr2-dev-plus-aosp