commit | 7556ad481bf1bbba2d5556f69bee9fca01c72b93 | [log] [tgz] |
---|---|---|
author | Samuel Tan <samueltan@google.com> | Wed Dec 16 18:55:58 2015 -0800 |
committer | Samuel Tan <samueltan@google.com> | Wed Dec 16 18:55:58 2015 -0800 |
tree | 6edf382f2ec30a546ee5ff41a353b49616fe6dce | |
parent | e28d4180ebefdac9c4c5cae0e94ad29bdc5a51de [diff] | |
parent | ee6b4b6467f11d77f7e26fd4f5f242ccdd1e3365 [diff] |
resolve merge conflicts of ee6b4b6467 to master. Change-Id: Ia17df264a6d7800a8fd2f0d39c2017ab48181894