| commit | c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:05:25 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:05:25 2012 -0700 |
| tree | c4377c747fc45b0660ace355f1f77dc32c333ac7 | |
| parent | 4f5f71a17d8963acf3642c91e3fb711d5f11a99c [diff] | |
| parent | 142158bd218421741d6d133e9ebbb1203ae6e6a6 [diff] |
am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 * commit '142158bd218421741d6d133e9ebbb1203ae6e6a6': DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73