| commit | 7d32c5d3b0a146be3e26147a79a68ee1d4d98426 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Tue Dec 01 15:42:47 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 01 15:42:47 2015 +0000 |
| tree | 0c6df18aa19335d98d5cfe47cf87edf1e49728fe | |
| parent | e664d97104abd2aad143eba438a7a1993ce9c8bf [diff] | |
| parent | 0da5fa4d6a0942a0297af6d85582d3978a473664 [diff] |
DO NOT MERGE ANYWHERE am: 0da5fa4d6a -s ours * commit '0da5fa4d6a0942a0297af6d85582d3978a473664': DO NOT MERGE ANYWHERE