tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent 0c0d54637af7109ae22e21a117dba3efdaded4b5
parent 680c92febe88260b74f101838a9734b8e10a704c
author Hyunyoung Song <hyunyoungs@google.com> 1438112297 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438112297 +0000

am 680c92fe: resolved conflicts for merge of 13ef17a3 to cw-e-dev b/22609402 Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95

* commit '680c92febe88260b74f101838a9734b8e10a704c':