| commit | 66e016ef7e62b5909b63605224ea336975d840ca | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu May 30 14:24:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 30 14:24:13 2013 -0700 |
| tree | ee10c8bd8d5f662827800d33398c931497d762b7 | |
| parent | c2211e31cccc3b95b11d785827c6325c33bb4485 [diff] | |
| parent | a8de0b4a8152ecd818e2ee8ae9b41af275c78dab [diff] |
am a8de0b4a: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'a8de0b4a8152ecd818e2ee8ae9b41af275c78dab': DO NOT MERGE - remove dns test from MR2