| commit | 255d3d807e353434518a98b03345fd559e24f8ce | [log] [tgz] |
|---|---|---|
| author | Raph Levien <raph@google.com> | Mon Jul 21 20:24:36 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sat Jul 19 23:20:08 2014 +0000 |
| tree | 815f491ee120b0979ed802aaf648dfdec3f0973e | |
| parent | c46678a553f98ace9be1733ff2fb4a7b4ac80e16 [diff] | |
| parent | c0b194f2c9a199093d7734a0e80dee05c039bcec [diff] |
Merge "Merge remote-tracking branch 'aosp/upstream-mirror' into merge-upstream"