| commit | 8a0474a4003c49bab1d1b29767128ce181a5399c | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Mon Jun 10 15:26:05 2013 -0700 |
| committer | The Android Automerger <android-build@android.com> | Tue Jun 11 18:12:37 2013 -0700 |
| tree | 10863db7cf88f97b46d074a31614066fde462173 | |
| parent | 09dd2b2da69ab6e0ee44596bc354ff6147d2cb22 [diff] |
resolve conflict and cherry-pick b0fc2287a1b0e863b5e2c4202868a0dbcfd79b96