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