| commit | a2517b20cb340a6dd19c846b21f34ed0244b65d6 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Oct 29 16:49:22 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Mon Oct 29 16:49:22 2012 -0700 |
| tree | 7500931a1763d0cb883a807d66fade60a4fd0a5c | |
| parent | 6b964fa1f265c1c0d6f236efbf3c471b76fdf05c [diff] | |
| parent | 47cd396b11ca4b62d4d99902bec1b981760e818a [diff] |
resolved conflicts for merge of 47cd396b to jb-mr1-dev-plus-aosp Change-Id: I3112f4cf0fafb6e7e3c9c60084a097f5e6190c22