| commit | 07df5f2e6578d69bd26b02f52cc7123e74455541 | [log] [tgz] |
|---|---|---|
| author | Chih-hung Hsieh <chh@google.com> | Thu Oct 01 00:10:42 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Oct 01 00:10:42 2015 +0000 |
| tree | 8a946140bfe4776eb4f3f3d6fc6ff74522a64118 | |
| parent | 33ce2b924413c9e0089deabce45d81c582d5284f [diff] | |
| parent | 68b91c56161a6f5a49f4ed1318f7ba0c2c8a080c [diff] |
Merge "Merge v4.0.0 from aosp/upstream-master"