| commit | 33d9d00a3c221e9b618856a15742cfbe68b83eb9 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Feb 14 22:55:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 14 22:55:05 2017 +0000 |
| tree | 18bc7275acfac00b0f2a294c2180f0203408e686 | |
| parent | ab79eb397383b079df9c9ef0cf8aa24cad8480ab [diff] | |
| parent | 37345554fea84afd446d6d8fbb87feea5a0dde3f [diff] |
resolve merge conflicts of 3654ad0 to mnc-dr-dev am: 37345554fe Change-Id: I7117544d1e2c909e353b7df3c42cfc25a9919ecf