| commit | 37d17b651831a97660048afcc446f6694a017df9 | [log] [tgz] |
|---|---|---|
| author | Yaowu Xu <yaowu@google.com> | Thu Oct 22 18:31:26 2015 -0700 |
| committer | Yaowu Xu <yaowu@google.com> | Thu Oct 22 18:31:26 2015 -0700 |
| tree | 1fef162958656ac2f098c6152966f96a9e3a8329 | |
| parent | 5a27b3bb85acaa80c2ca8526299638c2082836fb [diff] | |
| parent | f4af1a9af48c972da1d5d8f04b84fed1017a25b5 [diff] |
Merge branch 'masterbase' into nextgenv2 Conflicts: configure Change-Id: I7f331981e19338451d16030f0ac1179db2e08c4d