tree f3ede0d2b6ecba1fd02b42b5ff6ba19d95e4854a
parent 7df377a1c7247555ef4c9a84bd7e9b6b7db0d2a6
parent dfaeff757d6cefb2ed360e0f588117021b06b3f4
author Hyunyoung Song <hyunyoungs@google.com> 1456257719 +0000
committer android-build-merger <android-build-merger@google.com> 1456257719 +0000

Manual revert due to conflict: am: d31dcbcc7c
am: dfaeff757d

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