commit | 409d563b51853fc9dce6b4c02df84f58ec887afd | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Mon Jun 11 13:20:35 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 11 13:20:35 2012 -0700 |
tree | 1c1eef0a325690dad54cadc0c2a0ec6653df1e14 | |
parent | 47adf865bddf6c81051d457e04785408d2710f60 [diff] | |
parent | ac5f998396d6a3f1fa5bab131eb170e0fbcb375c [diff] |
Merge "DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB." into jb-dev