DO NOT MERGE Fix unexpected behavior in SDP am: 6ee3d8e16c am: 24f55d16a7
am: ea5b563bb9

Change-Id: I40da0b8f6c127487fe5680cb8cec937b3725b083
tree: 735d4593e78930140b90df5fb973953b6a2915eb
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE