From: Edward Jee <edjee@google.com>
Date: Wed, 17 Sep 2014 05:13:04 +0000 (+0000)
Subject: am 69010fb1: am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show phonebook... 
X-Git-Tag: android-x86-6.0-r1~671^2~513
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3c4f081f590a5ff84a2820b013a5ee300dbfdc73;p=android-x86%2Fpackages-apps-Settings.git

am 69010fb1: am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev

* commit '69010fb13af1de42e17e78772c5f85bb1fa28374':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
---

3c4f081f590a5ff84a2820b013a5ee300dbfdc73