| commit | 8e9369f3c2324aa0ee385ab7bffc10dbd590e5bb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 05 17:24:53 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 17:24:53 2013 -0800 |
| tree | 04c8e8d23eeb04ad264dc62e6f66b7a7b7dc385f | |
| parent | a395c6c1e424c7e5586dcc71d9df6d036aa0c3be [diff] | |
| parent | 722581a59873a98d30f7af34300049d524c1783f [diff] |
am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD * commit '722581a59873a98d30f7af34300049d524c1783f':