| commit | cfe5283b9e25abb5067927df66356611dfbbb377 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 22 17:32:04 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 22 17:32:04 2013 -0800 |
| tree | 91cba3d4c4e694953f72605c4fee7b9be933d0cb | |
| parent | ffcbb026045655bdf88593bdad333a69ed60cd8c [diff] | |
| parent | 70dfaee6386ab7564718f576c4c0b45da4274212 [diff] |
am 70dfaee6: Merge commit \'6c569d212164aa9334e27abac8884a3d13999420\' into HEAD * commit '70dfaee6386ab7564718f576c4c0b45da4274212':