| commit | dfaeff757d6cefb2ed360e0f588117021b06b3f4 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Feb 23 19:56:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 23 19:56:32 2016 +0000 |
| tree | f3ede0d2b6ecba1fd02b42b5ff6ba19d95e4854a | |
| parent | 1a187d4e3750e335a05eb83e73afedb8b03b3e1a [diff] | |
| parent | d31dcbcc7c7901959c65c4e635e59274a1d4c334 [diff] |
Manual revert due to conflict: am: d31dcbcc7c * commit 'd31dcbcc7c7901959c65c4e635e59274a1d4c334': Manual revert due to conflict: