| commit | 8b20327ee497302f778f4b519b68452a716bb7df | [log] [tgz] |
|---|---|---|
| author | Sailesh Nepal <sail@google.com> | Wed May 14 18:23:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 18:23:00 2014 +0000 |
| tree | 841f4494ee4d2e32a6a064caa29e5bd0636524c3 | |
| parent | bbec33053cc35ad5af0fa48d9e8f77644433be6f [diff] | |
| parent | 69af6b351d0231968b885494fd8e1e8b814bbb43 [diff] |
am 639b4d8e: Merge commit \'5bcdca79\' into manual_merge * commit '639b4d8e01dd36799487c7b91f5b295f28e2c9a5':