| commit | c816141bceb61d8f5a4e6aa6067c61f97a02efba | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Thu Dec 29 12:16:34 2016 -0800 |
| committer | Marie Janssen <jamuraa@google.com> | Thu Dec 29 12:44:03 2016 -0800 |
| tree | 49f15014d243ccb71c7ec577eb0f934e84e1a082 | |
| parent | 59d63e8b1d99ec7f90cc425b5d3908d05e14dcba [diff] | |
| parent | 9cc7ebe7d90c8da1340c8115023bd38451e58f7e [diff] |
resolve merge conflicts of 9cc7ebe to stage-aosp-master Change-Id: Ia1cdf49d77a574c38ed5cc33c31d5cf930103484