tree 9b72b22d561b20e74a10079d9160c644cf2db3b3
parent fa3aebf76285da0275be52a2254013dfd53b0e19
author Wink Saville <wink@google.com> 1402524651 -0700
committer Wink Saville <wink@google.com> 1402525263 -0700

Merge kwd to master

Add ims-common support from kwd

Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04