aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
AgeCommit message (Collapse)Author
2014-06-25Fix lpdk build.Wink Saville
Move aidl files from frameworks/opt/net/ims to frameworks/base so lpdk compiles. The reason is lpdk doesn't have frameworks/base sources so references to Pending and Bundle in aidl files breaks the pdk build. I had to move all of them and the ims/*java files for dependency reasons. Change-Id: I92452562591b157cecdfc01bcd892c4f35f5965c
2014-06-11Merge kwd to masterWink Saville
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04