| commit | 327a5640c2b2299f08f2f8de3345dc414caf6647 | [log] [tgz] |
|---|---|---|
| author | Bryan Mawhinney <bryanmawhinney@google.com> | Wed Feb 05 13:55:55 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 13:55:55 2014 -0800 |
| tree | 64420d9dbf8412c205e31331f0eb0b2cdab46b74 | |
| parent | c670f1e73a3a21aa22c33ed372105cc206586d10 [diff] | |
| parent | 9ab46af78ef14d9eed1a297842e93a36c3172740 [diff] |
am 9ab46af7: DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614 * commit '9ab46af78ef14d9eed1a297842e93a36c3172740': DO NOT MERGE Cherry picked from https://googleplex-android-review.googlesource.com/322614