| commit | bce1011dd2a371c587d2e39ad8c3d446b63049d0 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Thu Jun 14 14:14:45 2012 -0700 |
| committer | Raphael Moll <raphael@google.com> | Thu Jun 14 14:14:45 2012 -0700 |
| tree | 3e99f4996919ff44364c895e95999f3f9c03d37b | |
| parent | eb02d40c6d068ffcbb822910c5449b7081d1ae51 [diff] | |
| parent | 8cf489c1f509ad2414a887035ad3d6996d1931a3 [diff] |
resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aosp Change-Id: I06608e3c122b8f321429d457c51aa2213dd238b4