| commit | d6150a116d57bbac29f01b9571e15321bc49a3ce | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Feb 05 22:16:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 22:16:12 2014 +0000 |
| tree | 85c245b94a4019f1106ba030251b951c7ba09955 | |
| parent | d9603f73488ab3cacf044abb9784a54d0ab59c8e [diff] | |
| parent | cee87829852802652ad012fdf113358fbe1753c8 [diff] |
am cee87829: 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 'cee87829852802652ad012fdf113358fbe1753c8': DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614