| commit | 5e48fb0cc42f4c09080930e5c5ded1ef4bc89eed | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue Dec 06 12:39:27 2016 -0800 |
| committer | Colin Cross <ccross@android.com> | Tue Dec 06 12:54:07 2016 -0800 |
| tree | acbcc451ce1e1904be611a1c692ecb4529e704e7 | |
| parent | e39966631563bf0d6371ff6832acbc0ec203e64d [diff] | |
| parent | bbc9221f9f4247ef4e8af67e406d451d83fe118b [diff] |
Merge commit 'bbc9221' into master This merges the history from upstream without making any changes to the code. Change-Id: I303a906c2cb361cdc2b9a6c99da2b09782467254