tree 5b90b38b47f545ac7a94f728c5cf9cf47c52acdd
parent 17d6b4c1f7ce789475478375416959ff35fd09cb
parent b8fb609bb80b1fd16de46a0248188fff8ca722ea
author Chiao Cheng <chiaocheng@google.com> 1374541920 -0700
committer Chiao Cheng <chiaocheng@google.com> 1374543349 -0700

resolved conflicts for merge of b8fb609b to jb-mr1-dev

Change-Id: I336ee0b3f041f83a4b4e2c9973abb73852c2cc6f