tree 96beaf07307486f6491f022da63ebe381765d1a8
parent d598ec32d207d416eaba31635e3f1fa8284764cf
parent 3335d50582e7f36396bf0299f88742c801aebe2c
author Hyunyoung Song <hyunyoungs@google.com> 1438114718 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438114718 +0000

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

* commit '3335d50582e7f36396bf0299f88742c801aebe2c':