tree fe9ed94353b09dda232fceb64691f96dcd5db8d3
parent 147d1e85d3f62fbaa04c0250ab4318660f020aca
parent 9486780029868bc04e2bd2f2c2ed34283fa2d25d
author Hyunyoung Song <hyunyoungs@google.com> 1438113517 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438113517 +0000

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

* commit '9486780029868bc04e2bd2f2c2ed34283fa2d25d':