| commit | 82c46d11f6a84ac34c0fb82ea6845db33e63a439 | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Fri Feb 24 18:46:58 2017 -0800 |
| committer | Jack Yu <jackyu@google.com> | Fri Feb 24 18:47:01 2017 -0800 |
| tree | 387c20091a5f2d5781a38c61f5862d30c243ab3f | |
| parent | f4854018a20ab54358f82fc2bda7f33fdd48c14d [diff] | |
| parent | e091985bb5b55cb33af39d882d9ccef5cd100b50 [diff] |
resolve merge conflicts of e091985bb5b5 to stage-aosp-master Test: Manual Change-Id: Icaf4663abd3ad233afa3e31ff1939dbb7c07a2a5