commit | 68b91c56161a6f5a49f4ed1318f7ba0c2c8a080c | [log] [tgz] |
---|---|---|
author | Chih-Hung Hsieh <chh@google.com> | Wed Sep 30 12:39:23 2015 -0700 |
committer | Chih-Hung Hsieh <chh@google.com> | Wed Sep 30 14:22:46 2015 -0700 |
tree | 8a946140bfe4776eb4f3f3d6fc6ff74522a64118 | |
parent | 33ce2b924413c9e0089deabce45d81c582d5284f [diff] | |
parent | aed6d85d1594bcd1c08c43e8d09c300abaa72a11 [diff] |
Merge v4.0.0 from aosp/upstream-master Now this module compiles cleanly with both gcc and clang. * git merge aed6d85 * Minor changes to Android.mk files to compile the new source. * Add Android specific changes after merge of 4.0.0. Some old Android changes to 3.4.0 are not needed anymore. Bug: 18513435 Change-Id: I903f4ea78a96c4e55efdcb0db160f269fdb12da2