| commit | 7c65d085f4c0f48a6ec604d43eb410467e1cca64 | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Fri May 27 19:11:54 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 27 19:11:55 2016 +0000 |
| tree | ffbcce3a50ad51f2dd0776a70dab428203becb3e | |
| parent | d6e5332169b8e49bf88eaa69898f36998fa39b4f [diff] | |
| parent | b8ea2fdae0572b8803dd55b09e3aaf6713b3a5b5 [diff] |
Merge "Fix the feldspar-dev branch" into nyc-mr1-dev