| commit | cee87829852802652ad012fdf113358fbe1753c8 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Feb 05 22:11:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 22:11:55 2014 +0000 |
| tree | 3f27bebb67a754009475a5a5e6d2d1ddf0d85504 | |
| parent | bf65ad4e59f9ef15e4875b861835d54170279e34 [diff] | |
| parent | 996b519025bc2c0cc8f39164bde4d46377685e9b [diff] |
am 996b5190: am 35ed15aa: (-s ours) am 65c21107: am 327a5640: (-s ours) am 9ab46af7: DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614 * commit '996b519025bc2c0cc8f39164bde4d46377685e9b': DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614