commit | edebb6e7054e48d78487b9e240365018a6976f21 | [log] [tgz] |
---|---|---|
author | Danielle Millett <dmillett@google.com> | Tue Nov 15 12:21:01 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 15 12:21:01 2011 -0800 |
tree | b2290c6fc5a9dba0648036b50ed9f10a47eea334 | |
parent | d6553a5ddc4c3de201c640746e3b6dfc80342a0a [diff] | |
parent | 4a22c4e3faa542028e6196b6a1abad88e273ff47 [diff] |
am 49000016: am 8d8e669e: Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0 * commit '4900001670c5229fa06e57821a3436023c25520d': DO NOT MERGE cherry picking from MR0 cl 148223