| commit | 54c61d5715715ac7f1c6a4f7a53f981e09dc7134 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Sat Jun 14 00:57:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 14 00:57:50 2014 +0000 |
| tree | 77f3323323df2b1d60fa83f7e475f131116ef012 | |
| parent | 263fe68548f430d532517056963cb5de6863b9cc [diff] | |
| parent | b84783ecaa71f9450152f8d9b5f97e1b07f05ef6 [diff] |
am b84783ec: Merge "Backing this one out since the counterpart needs to be sent upstream." * commit 'b84783ecaa71f9450152f8d9b5f97e1b07f05ef6': Backing this one out since the counterpart needs to be sent upstream.