| commit | f1f7d9ba38b940aaf2add2078eba6f38c07367ea | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 20 08:26:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 08:26:25 2013 -0700 |
| tree | abe65d124c4b34730e140d777986cdfb27d02481 | |
| parent | 0e3bc9da0faad17bc1dbd6da975321d1a7336329 [diff] | |
| parent | 608a4731ca0f324043f11ca9d3b9c23a608023a3 [diff] |
am 608a4731: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '608a4731ca0f324043f11ca9d3b9c23a608023a3':