| commit | 65c21107c6fc86271e1a2c0798fd54ec8df52e67 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Feb 05 13:58:44 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 13:58:44 2014 -0800 |
| tree | 9d7228750325958a4fa784547b13f8be6ba57db2 | |
| parent | b89b71c58140b7e4f2c59279b8f7c8332d03a85c [diff] | |
| parent | 327a5640c2b2299f08f2f8de3345dc414caf6647 [diff] |
am 327a5640: (-s ours) am 9ab46af7: DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614 * commit '327a5640c2b2299f08f2f8de3345dc414caf6647': DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614