| commit | 888dad0df765256f4b47268400425103106894f0 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed May 14 00:05:38 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 14 00:05:38 2014 +0000 |
| tree | 378d9cf19f3d8a521f0b407709d5b152bd3353d1 | |
| parent | 6e923e1b51c87e7b20a98dfc2fff52ca9115c9d4 [diff] | |
| parent | f33a2f62a54ef966375a7fe8706ce713386d843e [diff] |
am f33a2f62: am f5af9a4a: am 273c5c3c: am 9ca7a039: resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev * commit 'f33a2f62a54ef966375a7fe8706ce713386d843e': Fix build due to incorrect merges [DO NOT MERGE]