| commit | d5f4e9b7d876044388e5ec3142199f096652cf4b | [log] [tgz] |
|---|---|---|
| author | Vladimir Marko <vmarko@google.com> | Mon Jul 14 20:39:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:39:33 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | a7f679381502e842369d9dda64feb21d3f55a5e4 [diff] | |
| parent | b49b6da8a499e2dc29a2cf5d2d36eca8cbd1d520 [diff] |
am b49b6da8: am 0449984d: am a5690945: am f55159c1: Merge "Fix style issue." * commit 'b49b6da8a499e2dc29a2cf5d2d36eca8cbd1d520':