| commit | 5e398801fd400cf21f2fab425975817e2f1c32f1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Dec 06 01:38:48 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 01:38:48 2013 +0000 |
| tree | d0a67cf1ccd51387337c6d5c0861e3ca5fe0d641 | |
| parent | 0f9de4f39ef9d780f6bbe9aaba79b9c9ee4a07d1 [diff] | |
| parent | e67167f62e59e4be783d97e5f29e85b2fb813176 [diff] |
am e67167f6: am 8e9369f3: am 722581a5: (-s ours) Merge commit \'d54f8c2d1b4d88db84465fee93aa29103ca32078\' into HEAD * commit 'e67167f62e59e4be783d97e5f29e85b2fb813176':