| commit | 926c62ef11fdec15f47e6f948fcf11bca61ac0a8 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Tue May 07 11:55:57 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 07 11:55:57 2013 -0700 |
| tree | a7bfd5bb5ffd8cc7a2088f438d5538dfb712f492 | |
| parent | f17ba4d762186648eb93115da1d011ab103dc711 [diff] | |
| parent | 4a783f2dbc5f7a6c31a9e961e96a46741e13b8cf [diff] |
am 4a783f2d: resolved conflicts for merge of bb3ed7eb to jb-mr2-dev * commit '4a783f2dbc5f7a6c31a9e961e96a46741e13b8cf': clean up pdk references in s.a.c