| commit | cfef1c84fffb9f781fccb0df4598e0dcdc022182 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Apr 16 11:15:29 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 16 11:15:29 2015 +0000 |
| tree | 6c24378eef62b4381033b9615d247f5934fc0342 | |
| parent | 864ce9c15ff259dbc683476c7e7bfbe4fc9f23ae [diff] | |
| parent | 75929a97332565c3b987986f35652b6d5d275d3c [diff] |
Merge "Revert "Merge remote-tracking branch 'aosp/upstream-dev' into merge""