| commit | 96bb1cc649e38bf498b159a16112e0ed10e8e9c4 | [log] [tgz] |
|---|---|---|
| author | Marie Janssen <jamuraa@google.com> | Thu Mar 16 19:26:33 2017 -0700 |
| committer | Marie Janssen <jamuraa@google.com> | Thu Mar 16 19:26:33 2017 -0700 |
| tree | 9ba5015b9c7b696b380e93d2a521417719b673d6 | |
| parent | 4b0b5e32582e71ac5a84590563c7407e7a039ec8 [diff] | |
| parent | f7a5fb6dfc8ffbe837bcec5736196490619c8874 [diff] |
resolve merge conflicts of f7a5fb6d to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I8171d349653590a858a21f4811e74d1993d70122