| commit | 273c5c3c4c74d29a127e614726ce2e5c5e274c20 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 23:54:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 23:54:21 2014 +0000 |
| tree | 695508f824481bfb9fadcee4c2ef96ca8c9eb67c | |
| parent | c251147a2b6f461427b1ce49f7066fadc97c1faf [diff] | |
| parent | 9ca7a039f73e5cf84f85282cf05d637517be2a17 [diff] |
am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit '9ca7a039f73e5cf84f85282cf05d637517be2a17': Fix build due to incorrect merges [DO NOT MERGE]