| commit | 0fda7a3b021e1334dbe355372b8519ff144fee7a | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Sat Feb 18 00:51:10 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Feb 18 00:51:11 2017 +0000 |
| tree | 237273c4783060a06441ec375a80eda20d1ac0aa | |
| parent | 9a91d3e8546dd0deee7d1ea9c4b52b0b3acf6c88 [diff] | |
| parent | 3b84f553e0e68d6ac5f9207449109b69d85a3621 [diff] |
Merge changes from topic 'rebase_from_upstream' * changes: android.c: Fix compile time warnings. Merge remote-tracking branch 'aosp/upstream-master' into mymerge