| commit | 54ee8c085a0902ae12c24ec4ee7dead57686b2ee | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 22 17:31:50 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 22 17:31:50 2013 -0800 |
| tree | 087a8bda1163867ed35f99d4bf8ec15e1c23237e | |
| parent | dda30aff7e48e27013e8d95ea489a61c1005af55 [diff] | |
| parent | 7a66117202f62dd988eee2465d72e243243f341b [diff] |
am 7a661172: Merge commit \'4d1860573a663ed47ea1f847774a1e3315649e07\' into HEAD * commit '7a66117202f62dd988eee2465d72e243243f341b':