tree f3ede0d2b6ecba1fd02b42b5ff6ba19d95e4854a
parent 1a187d4e3750e335a05eb83e73afedb8b03b3e1a
parent d31dcbcc7c7901959c65c4e635e59274a1d4c334
author Hyunyoung Song <hyunyoungs@google.com> 1456257392 +0000
committer android-build-merger <android-build-merger@google.com> 1456257392 +0000

Manual revert due to conflict:
am: d31dcbcc7c

* commit 'd31dcbcc7c7901959c65c4e635e59274a1d4c334':
  Manual revert due to conflict: