| commit | bd305216dfb7cd6327cb2489952d3bbdf773467a | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Tue Apr 21 09:39:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 21 09:39:34 2015 +0000 |
| tree | 14b1eb164dd7145bb895eea7a88a7ed02b2a4179 | |
| parent | 74f3df12bd7344bf10aae2b63e745a133772890d [diff] | |
| parent | 1b3078f7560aa3a54d1ec8d81c0ed5c3fe1ab788 [diff] |
am 1b3078f7: am 3d052ba4: Merge "Fix another mistyped location." * commit '1b3078f7560aa3a54d1ec8d81c0ed5c3fe1ab788': Fix another mistyped location.