tree e3294c3b2b32cd3532fa9b239326b1aaaa79fc40
parent 494d2237b8d7b892902604c18098127e77372509
parent 13ef17a37e683b8ad5800e9f542b411180fbec2f
author Hyunyoung Song <hyunyoungs@google.com> 1437696527 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1437696527 -0700

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