| commit | 2044b133f4ce20e4697cee8ecfaac93ff4ac4744 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Nov 25 12:27:32 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Mon Nov 25 12:27:32 2013 -0800 |
| tree | 255deb113deb856d427f8bd11563bb6e4c781e1e | |
| parent | 2e5b38d83234ff5a9a068ab07e7c51187ecd81a3 [diff] | |
| parent | 8250232f44cd3ec85d4832174197d9b8287b70fe [diff] |
Merge branch 'master' of persistent-https://googleplex-android.git.corp.google.com/platform/art into merge-goog-master-to-aosp-master